From: Daniel Hackney <dan@haxney.org>
Date: Mon, 27 Feb 2012 01:57:50 +0000 (+0800)
Subject: Fix oversight in package-load-list handling.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~602
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=30970dd8a76bfff407d39dd14275d4650a0ffa84;p=emacs.git

Fix oversight in package-load-list handling.

* lisp/emacs-lisp/package.el (package-compute-transaction): Handle
holding a package version to t in package-load-list.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95d0c244687..690423ed694 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-27  Daniel Hackney  <dan@haxney.org>  (tiny change)
+
+	* emacs-lisp/package.el (package-compute-transaction): Handle
+	holding a package version to t in package-load-list.
+
 2012-02-26  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (tramp-inodes, tramp-devices): Initialize with 0.
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index d80454ba269..ff4fbe3ead4 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -750,7 +750,8 @@ not included in this list."
 	      hold)
 	  (when (setq hold (assq next-pkg package-load-list))
 	    (setq hold (cadr hold))
-	    (cond ((eq hold nil)
+	    (cond ((eq hold t))
+		  ((eq hold nil)
 		   (error "Required package '%s' is disabled"
 			  (symbol-name next-pkg)))
 		  ((null (stringp hold))